Skip to content

Update SBT and plugins to latest versions #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Jul 9, 2021
Merged

Update SBT and plugins to latest versions #215

merged 5 commits into from
Jul 9, 2021

Conversation

retronym
Copy link
Member

No description provided.

@retronym retronym force-pushed the topic/modernize-sbt branch 2 times, most recently from f8ae22c to 45f1985 Compare June 15, 2021 02:17
@retronym retronym mentioned this pull request Jun 15, 2021
Open
@retronym retronym force-pushed the topic/modernize-sbt branch from 50e3358 to bc7ca20 Compare June 15, 2021 02:26
@retronym
Copy link
Member Author

@SethTisue What's the best way to do a re-run of the 2.13.6 packages with this PR to let us compare the artifacts?

@retronym retronym force-pushed the topic/modernize-sbt branch 3 times, most recently from e19672d to 98010ea Compare June 15, 2021 03:34
@retronym retronym force-pushed the topic/modernize-sbt branch from 98010ea to cd61713 Compare June 15, 2021 04:43
@retronym
Copy link
Member Author

retronym commented Jun 15, 2021 •
edited
Loading

Last sbt-native-packager upgrade issue #166, PR #180

@retronym retronym force-pushed the topic/modernize-sbt branch from 0c1430d to 709400f Compare June 15, 2021 06:06
@retronym retronym force-pushed the topic/modernize-sbt branch from 709400f to 83451fd Compare June 15, 2021 08:47
@retronym retronym marked this pull request as draft June 15, 2021 09:05
@SethTisue
Copy link
Member

What's the best way to do a re-run of the 2.13.6 packages with this PR to let us compare the artifacts?

It should be safe to run the usual release steps as far as the creation of the staging repos, but whether there is something along the way that will make it fail when Maven Central already has artifacts with the same version number, I simply don't know. Perhaps you'll need to make up a version number 2.13.6-2 or something and accept that the artifact-comparing will be harder.

@retronym
Copy link
Member Author

I'm going for local runs, using VMs to create and test installs of the .msi and .dep bundles.

@retronym retronym marked this pull request as ready for review June 16, 2021 09:01
@retronym
Copy link
Member Author

retronym commented Jun 16, 2021 •
edited
Loading

Looking good so far. Zip are identical according to zipcmp (which ignores timestamps).

Ideally we'd set the all timestamps deterministically to make the build repeatable, but that's one for another day.

$ git --git-dir ~/code/scala-dist-baseline/.git show --stat
commit 9b9c8955594b38821aa823846f68f483f7044c6a (HEAD -> 2.13.x, origin/HEAD, origin/2.13.x)
Merge: 632d27b 288038e
Author: Seth Tisue <seth@tisue.net>
Date:   Tue Jun 15 21:33:09 2021 -0700

    Merge pull request #217 from retronym/merge/2.12.x-to-2.13.x-20210616

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ubuntu@ubuntu1:/tmp/baseline$ git --git-dir ~/code/scala-dist/.git show --stat
commit 83451fd8df77bad86a1480fee0e1ae58dec3eae1 (HEAD -> topic/modernize-sbt, scala-dist-baseline)
Author: Jason Zaugg <jzaugg@gmail.com>
Date:   Tue Jun 15 16:01:30 2021 +1000

    Diagnostic for failed Wix compilation

 appveyor.yml      | 1 +
 project/Wix.scala | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

$ zipcmp -t -v /home/ubuntu/code/scala-dist-baseline/target/universal/scala-2.13.6.zip /home/ubuntu/code/scala-dist/target/universal/scala-2.13.6.zip

$ zipcmp /home/ubuntu/code/scala-dist-baseline/target/universal-docs/scala-docs-2.13.6.zip /home/ubuntu/code/scala-dist/target/universal-docs/scala-docs-2.13.6.zip

.rpm and .deb are extremely close in size, but I haven't analyzed the differences yet.

$ ls -la /home/ubuntu/code/scala-dist-baseline/target/scala-2.13.6.rpm /home/ubuntu/code/scala-dist/target/scala-2.13.6.rpm
-rw-rw-r-- 1 ubuntu ubuntu 138224796 Jun 16 18:02 /home/ubuntu/code/scala-dist-baseline/target/scala-2.13.6.rpm
-rw-rw-r-- 1 ubuntu ubuntu 138258506 Jun 16 16:28 /home/ubuntu/code/scala-dist/target/scala-2.13.6.rpm

$ ls -la /home/ubuntu/code/scala-dist-baseline/target/scala_2.13.6-400_all.deb /home/ubuntu/code/scala-dist/target/scala_2.13.6-400_all.deb
-rw-rw-r-- 1 ubuntu ubuntu 678368332 Jun 16 18:02 /home/ubuntu/code/scala-dist-baseline/target/scala_2.13.6-400_all.deb
-rw-rw-r-- 1 ubuntu ubuntu 678361638 Jun 16 16:28 /home/ubuntu/code/scala-dist/target/scala_2.13.6-400_all.deb

@SethTisue SethTisue mentioned this pull request Jun 16, 2021
Merged
@retronym retronym force-pushed the topic/modernize-sbt branch from 3060049 to eb5886f Compare June 28, 2021 03:19
@retronym
isSnapshot may be false for manually overriden versions
9830d10 
When using `sbt -Dscala.version=2.X.Y` to test out packages,
newer version of sbt-git have been setting `isSnapshot` to false
if there isn't a tag associated with the current commit of
scala/scala-dist. This makes it hard to test out changes in
this repo as we get diffs like:

```
$ rpm -qip /home/ubuntu/code/scala-dist-baseline/target/scala-2.13.6.rpm
Name        : scala
Version     : 2.13.6
Release     : 1
Architecture: noarch
Install Date: (not installed)
Group       : Development/Languages
Size        : 649267584
License     : BSD
Signature   : (none)
Source RPM  : scala-2.13.6-1.src.rpm
```

```
$ rpm -qip  /home/ubuntu/code/scala-dist/target/scala-2.13.6.rpm
Name        : scala
Version     : 2.13.6
Release     : SNAPSHOT
Architecture: noarch
Install Date: (not installed)
Group       : Development/Languages
Size        : 649267584
License     : BSD
Signature   : (none)
Source RPM  : scala-2.13.6-SNAPSHOT.src.rpm
...
```
@retronym retronym force-pushed the topic/modernize-sbt branch from eb5886f to 9830d10 Compare June 28, 2021 03:20
@retronym
Copy link
Member Author

The difference was a metadata difference. sbt-git is now setting the isSnapshot build setting to true when overriding the project with -Dproject.version=2.13.6. This propagates into the RPM metadata. More details in last commit message that works around this behaviour change.

@retronym
Copy link
Member Author

This one is ready to go from my perspective.

@retronym retronym requested a review from SethTisue June 28, 2021 03:29
dwijnand
dwijnand reviewed Jun 28, 2021
View reviewed changes
@SethTisue SethTisue self-assigned this Jun 28, 2021
dwijnand
dwijnand reviewed Jun 29, 2021
View reviewed changes
@retronym retronym force-pushed the topic/modernize-sbt branch from c4741fb to 0621261 Compare July 8, 2021 07:15
@retronym retronym merged commit b214084 into scala:2.13.x Jul 9, 2021
@retronym retronym deleted the topic/modernize-sbt branch July 9, 2021 01:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwijnand dwijnand dwijnand left review comments

@SethTisue SethTisue SethTisue approved these changes

Assignees

@SethTisue SethTisue

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@retronym @SethTisue @dwijnand